ChangeLog Merge fix

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27f49fd62cc7664e1241ab3058927835dd3f0834..d16724b6acc58bc27a3be66388a39e754ea4423c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -18,7 +18,6 @@
 
 2012-11-18  Glenn Morris  <rgm@gnu.org>
 
-       * woman.el (woman-non-underline-faces):
        * emacs-lisp/cl-lib.el (face-underline-p):
        Use set-face-underline rather than the alias set-face-underline-p.